a11y: Use cell renderer creation funcs unconditionally

Also delete the previous "new" functions and actually set the real cell
renderer here.

diff --git a/gtk/a11y/gtkbooleancellaccessible.c b/gtk/a11y/gtkbooleancellaccessible.c
index 67ae74eff5449324fd66b7456b04d95e4bf3f16b..d9182227b6b8b7b57bd58750019b079e2ccc7a2b 100644 (file)
--- a/gtk/a11y/gtkbooleancellaccessible.c
+++ b/gtk/a11y/gtkbooleancellaccessible.c
@@ -86,26 +86,3 @@ _gtk_boolean_cell_accessible_init (GtkBooleanCellAccessible *cell)
 {
 }
 
-AtkObject *
-_gtk_boolean_cell_accessible_new (void)
-{
-  GObject *object;
-  AtkObject *atk_object;
-  GtkRendererCellAccessible *cell;
-  GtkBooleanCellAccessible *boolean_cell;
-
-  object = g_object_new (GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE, NULL);
-
-  atk_object = ATK_OBJECT (object);
-  atk_object->role = ATK_ROLE_TABLE_CELL;
-
-  cell = GTK_RENDERER_CELL_ACCESSIBLE (object);
-  cell->renderer = gtk_cell_renderer_toggle_new ();
-  g_object_ref_sink (cell->renderer);
-
-  boolean_cell = GTK_BOOLEAN_CELL_ACCESSIBLE (object);
-  boolean_cell->cell_value = FALSE;
-  boolean_cell->cell_sensitive = TRUE;
-
-  return atk_object;
-}

diff --git a/gtk/a11y/gtkbooleancellaccessible.h b/gtk/a11y/gtkbooleancellaccessible.h
index 86a8c2c71f7e4c9268aa4a4a677b5096bbabf727..35cd7afc47ed8f66ea825654510c93f2acff3814 100644 (file)
--- a/gtk/a11y/gtkbooleancellaccessible.h
+++ b/gtk/a11y/gtkbooleancellaccessible.h
@@ -48,7 +48,6 @@ struct _GtkBooleanCellAccessibleClass
 };
 
 GType      _gtk_boolean_cell_accessible_get_type (void);
-AtkObject *_gtk_boolean_cell_accessible_new      (void);
 
 G_END_DECLS
 

diff --git a/gtk/a11y/gtkimagecellaccessible.c b/gtk/a11y/gtkimagecellaccessible.c
index 1db1470833ea0d71274cd062c4cf185e563ee307..e87eaabbcc46354742d98e9641f18c6c1e0bebde 100644 (file)
--- a/gtk/a11y/gtkimagecellaccessible.c
+++ b/gtk/a11y/gtkimagecellaccessible.c
@@ -60,28 +60,6 @@ _gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass)
   renderer_cell_class->property_list = property_list;
 }
 
-AtkObject *
-_gtk_image_cell_accessible_new (void)
-{
-  GObject *object;
-  AtkObject *atk_object;
-  GtkRendererCellAccessible *cell;
-
-  object = g_object_new (GTK_TYPE_IMAGE_CELL_ACCESSIBLE, NULL);
-
-  g_return_val_if_fail (object != NULL, NULL);
-
-  atk_object = ATK_OBJECT (object);
-  atk_object->role = ATK_ROLE_TABLE_CELL;
-
-  cell = GTK_RENDERER_CELL_ACCESSIBLE (object);
-
-  cell->renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_ref_sink (cell->renderer);
-
-  return atk_object;
-}
-
 static void
 _gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell)
 {

diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h
index 7920c5b6d7e5e6a66a3158ab1faf430d8e7cded2..b30c1fd7d5456bed073f57247bf49c562cd8c741 100644 (file)
--- a/gtk/a11y/gtkimagecellaccessible.h
+++ b/gtk/a11y/gtkimagecellaccessible.h
@@ -49,7 +49,6 @@ struct _GtkImageCellAccessibleClass
 };
 
 GType      _gtk_image_cell_accessible_get_type (void);
-AtkObject *_gtk_image_cell_accessible_new      (void);
 
 G_END_DECLS
 

diff --git a/gtk/a11y/gtkrenderercellaccessible.c b/gtk/a11y/gtkrenderercellaccessible.c
index 2318f9cb68fa3bd530bacc684c9bfd397da51155..381ac46ee4a40f564301aae7886df71af7ac814a 100644 (file)
--- a/gtk/a11y/gtkrenderercellaccessible.c
+++ b/gtk/a11y/gtkrenderercellaccessible.c
@@ -125,6 +125,7 @@ _gtk_renderer_cell_accessible_new (GtkCellRenderer *renderer)
   g_return_val_if_fail (GTK_IS_CELL_RENDERER (renderer), NULL);
 
   object = g_object_new (_gtk_cell_renderer_get_accessible_type (renderer),
+                         "renderer", renderer,
                          NULL);
 
   atk_object_set_role (object, ATK_ROLE_TABLE_CELL);

diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c
index f289f931ed29319ef853b6e4c37183d9521cfe71..194da5787bc5d8e9a32feb062e55264450ef1e27 100644 (file)
--- a/gtk/a11y/gtktextcellaccessible.c
+++ b/gtk/a11y/gtktextcellaccessible.c
@@ -245,28 +245,6 @@ _gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell)
   text_cell->cell_length = 0;
 }
 
-AtkObject *
-_gtk_text_cell_accessible_new (void)
-{
-  GObject *object;
-  AtkObject *atk_object;
-  GtkRendererCellAccessible *cell;
-
-  object = g_object_new (GTK_TYPE_TEXT_CELL_ACCESSIBLE, NULL);
-
-  g_return_val_if_fail (object != NULL, NULL);
-
-  atk_object = ATK_OBJECT (object);
-  atk_object->role = ATK_ROLE_TABLE_CELL;
-
-  cell = GTK_RENDERER_CELL_ACCESSIBLE(object);
-
-  cell->renderer = gtk_cell_renderer_text_new ();
-  g_object_ref_sink (cell->renderer);
-
-  return atk_object;
-}
-
 static gchar *
 gtk_text_cell_accessible_get_text (AtkText *atk_text,
                                    gint     start_pos,

diff --git a/gtk/a11y/gtktextcellaccessible.h b/gtk/a11y/gtktextcellaccessible.h
index fd656d59544d7c44af8c9b1469b33c844d38adeb..ac54986511a0b7c20d0ec3aacf0edab2f0208d3e 100644 (file)
--- a/gtk/a11y/gtktextcellaccessible.h
+++ b/gtk/a11y/gtktextcellaccessible.h
@@ -49,7 +49,6 @@ struct _GtkTextCellAccessibleClass
 };
 
 GType      _gtk_text_cell_accessible_get_type (void);
-AtkObject *_gtk_text_cell_accessible_new      (void);
 
 G_END_DECLS
 

diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
index 4da3fff43e7e1274f45f1d87342b70111001a5fc..b472e22c6c183df6f6d3608b1bf565c7bd657188 100644 (file)
--- a/gtk/a11y/gtktreeviewaccessible.c
+++ b/gtk/a11y/gtktreeviewaccessible.c
@@ -455,14 +455,7 @@ gtk_tree_view_accessible_ref_child (AtkObject *obj,
     {
       renderer = GTK_CELL_RENDERER (l->data);
 
-      if (GTK_IS_CELL_RENDERER_TEXT (renderer))
-        child = _gtk_text_cell_accessible_new ();
-      else if (GTK_IS_CELL_RENDERER_TOGGLE (renderer))
-        child = _gtk_boolean_cell_accessible_new ();
-      else if (GTK_IS_CELL_RENDERER_PIXBUF (renderer))
-        child = _gtk_image_cell_accessible_new ();
-      else
-        child = _gtk_renderer_cell_accessible_new (renderer);
+      child = _gtk_renderer_cell_accessible_new (renderer);
 
       cell = GTK_CELL_ACCESSIBLE (child);
       renderer_cell = GTK_RENDERER_CELL_ACCESSIBLE (child);